From b47b1428b817528b30dc6bb84d96ce85681e8aef Mon Sep 17 00:00:00 2001
From: Matthias Clasen <mclasen@redhat.com>
Date: Fri, 24 Sep 2010 11:10:51 -0400
Subject: [PATCH] GtkNotebook: remove gtk_notebook_set_window_creation_hook

http://bugzilla.gnome.org/show_bug.cgi?id=630521
---
 docs/reference/gtk/gtk3-sections.txt |  2 --
 gtk/gtk.symbols                      |  1 -
 gtk/gtknotebook.c                    | 34 ----------------------------
 gtk/gtknotebook.h                    | 13 ++---------
 4 files changed, 2 insertions(+), 48 deletions(-)

diff --git a/docs/reference/gtk/gtk3-sections.txt b/docs/reference/gtk/gtk3-sections.txt
index 159462c2da..c739b3cef4 100644
--- a/docs/reference/gtk/gtk3-sections.txt
+++ b/docs/reference/gtk/gtk3-sections.txt
@@ -2226,8 +2226,6 @@ gtk_notebook_set_group
 gtk_notebook_get_group
 gtk_notebook_set_action_widget
 gtk_notebook_get_action_widget
-GtkNotebookWindowCreationFunc
-gtk_notebook_set_window_creation_hook
 <SUBSECTION Standard>
 GTK_NOTEBOOK
 GTK_IS_NOTEBOOK
diff --git a/gtk/gtk.symbols b/gtk/gtk.symbols
index 0a13dba9e3..bf535584e0 100644
--- a/gtk/gtk.symbols
+++ b/gtk/gtk.symbols
@@ -2066,7 +2066,6 @@ gtk_notebook_set_tab_label_text
 gtk_notebook_set_tab_pos
 gtk_notebook_get_tab_hborder
 gtk_notebook_get_tab_vborder
-gtk_notebook_set_window_creation_hook
 gtk_notebook_get_group
 gtk_notebook_set_group
 gtk_notebook_get_tab_reorderable
diff --git a/gtk/gtknotebook.c b/gtk/gtknotebook.c
index 456be285ce..f696906dea 100644
--- a/gtk/gtknotebook.c
+++ b/gtk/gtknotebook.c
@@ -467,10 +467,6 @@ static void gtk_notebook_buildable_add_child      (GtkBuildable *buildable,
 						   GObject      *child,
 						   const gchar  *type);
 
-static GtkNotebookWindowCreationFunc window_creation_hook = NULL;
-static gpointer window_creation_hook_data;
-static GDestroyNotify window_creation_hook_destroy = NULL;
-
 static guint notebook_signals[LAST_SIGNAL] = { 0 };
 
 G_DEFINE_TYPE_WITH_CODE (GtkNotebook, gtk_notebook, GTK_TYPE_CONTAINER,
@@ -958,9 +954,6 @@ gtk_notebook_class_init (GtkNotebookClass *class)
    * necessary properties to the notebook (e.g. the 
    * #GtkNotebook:group ).
    *
-   * The default handler uses the global window creation hook,
-   * if one has been set with gtk_notebook_set_window_creation_hook().
-   *
    * Returns: a #GtkNotebook that @page should be added to, or %NULL.
    *
    * Since: 2.12
@@ -3367,9 +3360,6 @@ gtk_notebook_create_window (GtkNotebook *notebook,
                             gint         x,
                             gint         y)
 {
-  if (window_creation_hook)
-    return (* window_creation_hook) (notebook, page, x, y, window_creation_hook_data);
-
   return NULL;
 }
 
@@ -7594,30 +7584,6 @@ gtk_notebook_reorder_child (GtkNotebook *notebook,
 		 position);
 }
 
-/**
- * gtk_notebook_set_window_creation_hook:
- * @func: (allow-none): the #GtkNotebookWindowCreationFunc, or %NULL
- * @data: user data for @func
- * @destroy: (allow-none): Destroy notifier for @data, or %NULL
- *
- * Installs a global function used to create a window
- * when a detached tab is dropped in an empty area.
- * 
- * Since: 2.10
- **/
-void
-gtk_notebook_set_window_creation_hook (GtkNotebookWindowCreationFunc  func,
-				       gpointer                       data,
-                                       GDestroyNotify                 destroy)
-{
-  if (window_creation_hook_destroy)
-    window_creation_hook_destroy (window_creation_hook_data);
-
-  window_creation_hook = func;
-  window_creation_hook_data = data;
-  window_creation_hook_destroy = destroy;
-}
-
 /**
  * gtk_notebook_set_group:
  * @notebook: a #GtkNotebook
diff --git a/gtk/gtknotebook.h b/gtk/gtknotebook.h
index 4240338595..efbb6274db 100644
--- a/gtk/gtknotebook.h
+++ b/gtk/gtknotebook.h
@@ -100,12 +100,6 @@ struct _GtkNotebookClass
   void (*_gtk_reserved1) (void);
 };
 
-typedef GtkNotebook* (*GtkNotebookWindowCreationFunc) (GtkNotebook *source,
-                                                       GtkWidget   *page,
-                                                       gint         x,
-                                                       gint         y,
-                                                       gpointer     data);
-
 /***********************************************************
  *           Creation, insertion, deletion                 *
  ***********************************************************/
@@ -142,11 +136,8 @@ void gtk_notebook_remove_page       (GtkNotebook *notebook,
  *           Tabs drag and drop                            *
  ***********************************************************/
 
-void gtk_notebook_set_window_creation_hook (GtkNotebookWindowCreationFunc  func,
-					    gpointer                       data,
-                                            GDestroyNotify                 destroy);
-void gtk_notebook_set_group                (GtkNotebook *notebook,
-					    gpointer     group);
+void gtk_notebook_set_group                (GtkNotebook    *notebook,
+                                            gpointer        group);
 gpointer gtk_notebook_get_group            (GtkNotebook *notebook);
 
 
-- 
2.30.2